gnomeos: Prefix branch names with -yocto to clarify their origin

Also add git to the dev image.

diff --git a/gnomeos/yocto/commit-yocto-build.sh b/gnomeos/yocto/commit-yocto-build.sh
index 5307fefad7d87650fbf9819dc88ede56a1355a5d..64b988fc970c37af1830661d131ae3500d4f2421 100755 (executable)
--- a/gnomeos/yocto/commit-yocto-build.sh
+++ b/gnomeos/yocto/commit-yocto-build.sh
@@ -5,6 +5,9 @@ set -e
 set -x
 
 WORKDIR=`pwd`
+cd `dirname $0`
+SCRIPT_SRCDIR=`pwd`
+cd -
 
 if test $(id -u) = 0; then
     cat <<EOF
@@ -24,6 +27,8 @@ shift
 
 ARCH=x86
 
+OSTREE_VER=$(cd $SCRIPT_SRCDIR && git describe)
+
 BUILDDIR=$WORKDIR/tmp-eglibc
 
 OSTREE_REPO=$WORKDIR/repo
@@ -36,6 +41,6 @@ cd $tempdir
 mkdir fs
 cd fs
 fakeroot -s ../fakeroot.db tar xf $BUILD_TAR
-fakeroot -i ../fakeroot.db ostree --repo=${OSTREE_REPO} commit -s "Build ${BUILD_TIME}" -b "gnomeos-$ARCH-$BRANCH"
+fakeroot -i ../fakeroot.db ostree --repo=${OSTREE_REPO} commit -s "Build from OSTree ${OSTREE_VER}" -b "gnomeos-yocto-$ARCH-$BRANCH"
 cd "${WORKDIR}"
 rm -rf $tempdir

diff --git a/gnomeos/yocto/gnomeos-run.sh b/gnomeos/yocto/gnomeos-run.sh
index e1e4427bf16fa44e9b32e7bb0963c5426231f68e..12f8e3a200993f4dda72904d4771b96c90861cd5 100755 (executable)
--- a/gnomeos/yocto/gnomeos-run.sh
+++ b/gnomeos/yocto/gnomeos-run.sh
@@ -42,7 +42,7 @@ shift
 test -n "$OSTREE_REPO" || usage
 
 ARCH=x86
-BRANCH_PREFIX="gnomeos-${ARCH}-"
+BRANCH_PREFIX="gnomeos-yocto-${ARCH}-"
 
 OBJ=gnomeos-fs.img
 if (! test -f ${OBJ}); then
@@ -96,4 +96,4 @@ if ! echo $ARGS | grep -q 'ostree='; then
     ARGS="ostree=${BRANCH_PREFIX}base-current $ARGS"
 fi
 
-exec qemu-kvm -kernel ./tmp-eglibc/deploy/images/bzImage-qemux86.bin -hda gnomeos-fs.img -append "$ARGS"
+exec qemu-kvm -kernel ./tmp-eglibc/deploy/images/bzImage-qemux86.bin -hda gnomeos-fs.img -net user -net nic,model=virtio -append "$ARGS"

diff --git a/gnomeos/yocto/recipies-core/images/gnomeos-contents-dev.bb b/gnomeos/yocto/recipies-core/images/gnomeos-contents-dev.bb
index ff8d2aa3d8af8d015732fb57e65905b608050644..42244fa3d776c94f5d2240099c5e94e402ab61b4 100644 (file)
--- a/gnomeos/yocto/recipies-core/images/gnomeos-contents-dev.bb
+++ b/gnomeos/yocto/recipies-core/images/gnomeos-contents-dev.bb
@@ -7,4 +7,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 
 inherit gnomeos-contents
 
-PACKAGE_INSTALL += "task-core-sdk"
+PACKAGE_INSTALL += "task-core-sdk \
+               bison flex \
+               git \
+               "